Describe your changes

Resolves AB#32332

Checklist before requesting a review

• I have performed a self-review of my code
• I have added tests wherever relevant
• I have made sure that all automated checks pass before requesting a review

Notes for the reviewer

1. I am open to better ways to fixing this. Maybe global style that solves both cases at once? And maybe something that resolves the root cause instead of "correcting" it which is maybe more what I did?
2. On the other hand, we also shouldn't spend too much time on this.